Add ContactUtils.java and some changes