Refactor code to use join for Contact