Fixes

Create properties and object initializer