Add filtering for associations