Added a few more fields. Updated README as well