#37 added more necessary fields