Added controller loading to the core class