Added more functionality and user search