Expand class hierarchy in preparation for main context.