Revised join table