Added some minor preparations for actual bots