add cbs compability to dhcp module+small fixes