Improved controller invocation