Update #38 and CRUD associated functions