added fapdu support