Upgraded to proper custom controller integration.