Updated the model to take an option hash