Added Uri scheme checking for ExpansionStorage