Updated toObject method to not assign constant values ...