Added new bot types, refactoring