Add validation for fields & exclude type.