UABot refactor part 2