Made match and type fields required