Removed Contact entity which may cause confusing