avp: converted to the new module interface