Fix CRUD 

Issue #55 #56