Fix inheritance mapping