Revision of CelestialObject class