Adding few changes to client