configuration improvements and added support for emptyValue