Add aif support