Added some more filed