Review dictionary VALUE and how they are handled

[MikhailMS]

The way crate allows usage of VALUE's doesn't look right to me, so need to ensure it all works (or fix if it doesn't)