Added required fields (Issue #65)