Adapted CRUD to new DB-Version