CORE-236 - The new objects and constants - though they're not currently used by any logic.