Changed all controllers to inherit from new parent