Updated the definitions for the models