Fixed support for mapping classes