Updated pgsql schema and maps to 2.3-dev