made CRUD operations more RFC compliant