Finishing touches CRUD.

Change-Id: I42dbed9c40e19de44ab000c2f2ef2ad15702e626