Add support for ordered attributes