Switching from includes to joins