added a few more fields