Added flexibility in calls for HCHO/CH2O