Updated the model to accomadate SP changes

Updated the model to accomadate SP changes