Index: src/dgp/thesymbols.hh
===================================================================
--- src/dgp/thesymbols.hh	(revision 5f4d9c3b32eea7b6643a751aa75bdb05b7d41576)
+++ src/dgp/thesymbols.hh	(revision e7de6cc88c605c4f810cbc852e843294b4b0e8ac)
@@ -9,21 +9,28 @@
 #include <bitset>
 
-typedef Symbol<1> Cat;
+using namespace std;
 
-typedef Symbol<2> Role;
-typedef list<Role> RoleList;
-typedef list<Role>::iterator RoleListIter;
-typedef bitset<MAXTYPES> RoleSet;
-typedef set<Role> Roles;
-typedef Roles::iterator RolesIter;
+typedef Symbol<1>              Cat;
+typedef bitset<MAXCATS>        CatSet;
 
-typedef Symbol<3> Constr;
-typedef list<Constr> ConstrList;
+typedef Symbol<2>              Role;
+typedef list<Role>             RoleList;
+typedef list<Role>::iterator   RoleListIter;
+typedef bitset<MAXTYPES>       RoleSet;
+typedef set<Role>              Roles;
+typedef Roles::iterator        RolesIter;
+
+typedef Symbol<3>              Constr;
+typedef list<Constr>           ConstrList;
 typedef list<Constr>::iterator ConstrListIter;
 
-typedef Symbol<4> Rel;
+typedef Symbol<4>              LongRel;
+typedef set<LongRel>           LongRels;
 
-typedef Symbol<5> Flag;
-typedef bitset<MAXFLAGS> FlagSet;
+typedef Symbol<5>              Flag;
+typedef bitset<MAXFLAGS>       FlagSet;
+
+typedef Symbol<6>              Prop;
+typedef bitset<MAXPROPS>       PropSet;
 
 #endif