Completed #5.

* Added new fields.
* Improved error messages.