@stof do we need to do something about the $mappings array here or is it fine?