Add support for additional layout attributes