Added support for console