Added a few new fields and updated some annotations