Updates to object creation and handling.