Use mapped-super-class mapping for easier extension