updated for additional fields
updated documenation