Performace increase, each field now has its own label