Added/improved internal classes.