Moved normalizing of attribute.values to DaoFactory#define