Mahendra,simij | #191 | Added edit functionality. Moved some functionality from controller to service