Fixed dynamic mapping for inheritance - fixes autocomplete for #85