- Some modifications to abstract the model