New ModelObjectConstants, + ModelObjectConstants Overhaul