+Shilpa: MOAR GEMS!
+Shilpa: Added validations for Drive
+Shilpa: Minor cleanup.