Api changes

Merging matching changes for Bot API that allows two local bots