Add UserId to start and move api calls