Provided some additional fields and minor fixes