Added a couple more fields