These belong here where they are first used
Separate attributes into topical files
Syntax fix for override