Add layouts support