Incremental updates

Slight changes to base classes.