Implemented initial mapping infrastructure.