Updated how Object should be created etc