Version 2.1.0.pre03.
Further field-mapping work.
Version 2.1.0.pre04.