* Fix unlisted exception due to recent modification in CoreDB interface * Refactor beacon skeleton * More unlisted exception fix