Introduce of mapper interfaces. Slight perfomance improvements.