Moved all EntityData related datatypes to PG