Removed code related to Contact because it may cause confusing