Feature/handle client side defaultvalues