added some more fields