Add some work on users api