Started added mapping functionality mapping