Completed changes to make it work with ambasadoro-0.1