Added new models, functionalities changed with respect to new schema