Finalized userObjects, added solarEnvelope