Updated how Object should be created etc
Merge with master