Updated normalization for postgres databases.