WIP: Fix application controller extension