Issue #128 - change required fields