Move overrides to attributes file
Merge branch 'refactor-attributes' into develop