Separated commands and added Rota command