Added full CRUD feature