Changing some propertines into Entities due the changes in the Data Base model.