Added in attribute metadata
Merged with broken changes