Major reworking of core API concepts.