Update to FFCMS 2.0.4 compatable