Refactor CRUD Operations