Adding compability with client

Adding compability with client sending