codebase extended with messenger helper code