Additional improvements, added support from running the bot from another package