Complete mappings rework - most composite classes need to be fixed (will do tomorrow)