First commit for user search