replace deprecated association includes