Better contacts counter, datamapper added