changed field name based on DB