Added functionality to client