Add defaultValue support, closes #11