Add support for non conventional controller returns