UC-18

* Required fields