added default values support