Changed ctrl class structure.