Mappers and Gateways
REBASED 21/11/2013