Added support of nil as a default value