Cleanup
Adding fields