Remove obsolete requires
Rename string helper
Include object definitions in BOT relations
Code layout
Refine token detection to include object types