Added support for the new layout