Added mappings for the subclass