Fixing use of properties
Refactoring attr preparation