Changing interface to work with client server