Adding support for /users endpoints