Index: trunk/psModules/src/concepts/pmConcepts.c
===================================================================
--- trunk/psModules/src/concepts/pmConcepts.c	(revision 15141)
+++ trunk/psModules/src/concepts/pmConcepts.c	(revision 15740)
@@ -622,4 +622,87 @@
             pmConceptRegister(fpaTemp, NULL, NULL, false, PM_FPA_LEVEL_FPA);
             psFree(fpaTemp);
+        }
+
+        // FPA.M1X,Y,Z,TIP,TILT
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.M1X", "Primary Mirror X Position", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
+        }
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.M1Y", "Primary Mirror Y Position", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
+        }
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.M1Z", "Primary Mirror Z Position", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
+        }
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.M1TIP", "Primary Mirror TIP", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
+        }
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.M1TILT", "Primary Mirror TILT", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
+        }
+
+        // FPA.M2X,Y,Z,TIP,TILT
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.M2X", "Primary Mirror X Position", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
+        }
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.M2Y", "Primary Mirror Y Position", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
+        }
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.M2Z", "Primary Mirror Z Position", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
+        }
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.M2TIP", "Primary Mirror TIP", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
+        }
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.M2TILT", "Primary Mirror TILT", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
+        }
+
+        // FPA.ENV.*
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.ENV.TEMP", "Environment: Temperature", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
+        }
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.ENV.HUMID", "Environment: Humidity", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
+        }
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.ENV.WIND", "Environment: Wind Speed", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
+        }
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.ENV.DIR", "Environment: Wind Direction", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
+        }
+
+	// FPA.PON.TIME
+        {
+            psMetadataItem *item = psMetadataItemAllocF32("FPA.PON.TIME", "Power On Time", NAN);
+            pmConceptRegister(item, NULL, NULL, false, PM_FPA_LEVEL_FPA);
+            psFree(item);
         }