Added functionality to look for user