Added support for single expanded mode