Changed initialization of controllers