Create separate class for empty attributes
Merge branch 'master' into type-substitution
WIP