Added support for custom session controllers