Changes for IFCMW and Client