Some web API improvement