Add support for default values
0.0.3