changes for join table and parser for aggregates