Updated references
Fallback if a controller cannot be resolved (for built-in controllers)
Updated version