Changed interface to allow editable mappings