Added a few more fields to keep things interesting