Added initial mapping functionality