Added extra checks for ext storage class