Working on beacon plugin