Work on beacon prototype with new features