Updated Controller handling