Added support for edit,new,delete & move