Introduced stub aliases, introduced controllers to diffuse complexity