Add more fields, clean up separation
add statistics