Added enableAddNewValue opttion