Added/updated code to implement support for fetching user based on user id.