Updated the model to support user specific data