Updated/New Composer support for File_Infopath

See diff for full changes