Started to implement the mapping functionality