added mandatory fields