Update model to be more generic