Added relevant changes for Deeva