Updated initial object creation and updating