Added command and screen controllers