Added WEPIF support