Need to refactor join table