Added support for new layout flow