Included option to skip non-required fields