(#7) Add ability to use default value