adding layout-template support