Changed order mapping to a mapped superclass