Added some custom fields