Sneha/Shruthi | #986 | Addind some missing measure based on SriRam's feedback.