Added few more fields