Adding support for layouts