Bug [#1396] Refactor and fix contacts