Add support for creating layouts