Add layout namespace support