updated fields and label naming