Add a few more fields