Added skip logic template/scripts and fields