Adding analysis of required fields as well