Further fields added with logic

Additional NSC validation started - see public/xml/