#50 Introduce contact map