Modification of ANDS rifcs plugin