Added ControllerDescriptor factory to centralize logic about creating controller descriptor based on type.
Removed TODO tasks that no longer make sense to do.