Revisions to core classes