diff --git a/pmaptype.c b/pmaptype.c
index 1f100ea..d13a801 100644
--- a/pmaptype.c
+++ b/pmaptype.c
@@ -1,38 +1,51 @@
 #ifndef lint
 static const char RCSid[] = "$Id: pmaptype.c,v 2.5 2016/05/17 17:39:47 rschregle Exp $";
 #endif
 
 /* 
    ==================================================================
    Photon map types and corresponding file format strings
 
    Roland Schregle (roland.schregle@{hslu.ch, gmail.com})
    (c) Fraunhofer Institute for Solar Energy Systems,
+       supported by the German Research Foundation 
+       (DFG LU-204/10-2, "Fassadenintegrierte Regelsysteme" (FARESYS)) 
    (c) Lucerne University of Applied Sciences and Arts,
-   supported by the Swiss National Science Foundation (SNSF, #147053)
+       supported by the Swiss National Science Foundation 
+       (SNSF #147053, "Daylight Redirecting Components")
+   (c) Tokyo University of Science,
+       supported by the JSPS Grants-in-Aid for Scientific Research 
+       (KAKENHI JP19KK0115, "Three-Dimensional Light Flow")
    ==================================================================
    
    $Id: pmaptype.c,v 2.5 2016/05/17 17:39:47 rschregle Exp $
 */
 
 
 #include "pmaptype.h"
 
 #ifdef PMAP_OOC
    #define PMAP_FMTSUFFIX  "OOC_Photon_Map"
 #else
    #define PMAP_FMTSUFFIX  "kdT_Photon_Map"
 #endif
 
 
 /* Format strings for photon map files corresponding to PhotonMapType */
 const char *pmapFormat [NUM_PMAP_TYPES] = { 
    "Radiance_Global_"   PMAP_FMTSUFFIX, "Radiance_PreComp_" PMAP_FMTSUFFIX,
    "Radiance_Caustic_"  PMAP_FMTSUFFIX, "Radiance_Volume_"  PMAP_FMTSUFFIX,
-   "Radiance_Direct_"   PMAP_FMTSUFFIX, "Radiance_Contrib_" PMAP_FMTSUFFIX
+   "Radiance_Direct_"   PMAP_FMTSUFFIX, "Radiance_Contrib_" PMAP_FMTSUFFIX,
+#ifdef PMAP_PHOTONFLOW
+   "Radiance_LightFlow_" PMAP_FMTSUFFIX
+#endif
 };
 
 /* Photon map names per type */
 const char *pmapName [NUM_PMAP_TYPES] = {
-   "global", "precomp", "caustic", "volume", "direct", "contrib"
+   "global", "precomp", "caustic", "volume", "direct", "contrib",
+#ifdef PMAP_PHOTONFLOW
+   "lightflow"
+#endif
 };
+
diff --git a/pmaptype.h b/pmaptype.h
index 66ae412..c00e39b 100644
--- a/pmaptype.h
+++ b/pmaptype.h
@@ -1,38 +1,49 @@
 /* RCSid $Id: pmaptype.h,v 2.5 2016/05/17 17:39:47 rschregle Exp $ */
 
 /* 
    ==================================================================
    Photon map types and corresponding file format strings
 
    Roland Schregle (roland.schregle@{hslu.ch, gmail.com})
    (c) Fraunhofer Institute for Solar Energy Systems,
+       supported by the German Research Foundation 
+       (DFG LU-204/10-2, "Fassadenintegrierte Regelsysteme" (FARESYS)) 
    (c) Lucerne University of Applied Sciences and Arts,
-   supported by the Swiss National Science Foundation (SNSF, #147053)
+       supported by the Swiss National Science Foundation 
+       (SNSF #147053, "Daylight Redirecting Components")
+   (c) Tokyo University of Science,
+       supported by the JSPS Grants-in-Aid for Scientific Research 
+       (KAKENHI JP19KK0115, "Three-Dimensional Light Flow")
    ==================================================================
    
    $Id: pmaptype.h,v 2.5 2016/05/17 17:39:47 rschregle Exp $
 */
 
 
 #ifndef PMAPTYPE_H
    #define PMAPTYPE_H
    
    /* Photon map types */
    typedef enum {
       PMAP_TYPE_NONE = -1, PMAP_TYPE_GLOBAL,    PMAP_TYPE_PRECOMP, 
       PMAP_TYPE_CAUSTIC,   PMAP_TYPE_VOLUME,    PMAP_TYPE_DIRECT,
-      PMAP_TYPE_CONTRIB,   NUM_PMAP_TYPES
+      PMAP_TYPE_CONTRIB,
+   #ifdef PMAP_PHOTONFLOW
+      PMAP_TYPE_LIGHTFLOW,
+   #endif
+      NUM_PMAP_TYPES
    } PhotonMapType;
 
    /* Check for valid photon map type */
    #define validPmapType(t)   ((t) >= 0 && (t) < NUM_PMAP_TYPES)
    
    /* Glob string for extracting photon map format from file header */
    #define PMAP_FORMAT_GLOB   "Radiance_*_Photon_Map"
    
    /* Format strings for photon map files corresponding to PhotonMapType */
-   extern const char *pmapFormat [];      
+   extern const char *pmapFormat [];
    
    /* Photon map names per type */
    extern const char *pmapName [];
 #endif
+