Updated to use hosted services