Tidy up core classes.
Add inputMappings and related methods.