Changed CRUD to account for client