Add MappedID and utilities