Added couple more fields