Update of the Data access layer and Business logic