Removed pointless array check and moved uri's key & value to provider