Adding some more fields to join on