Cleaned up schema for common postgres db