Vishal #0 Minor enhacements to crud