Fixing required fields for #24