Added support for basic mode