Introduce dictionary factory and value transformers