Update the data model to simplify request references