Added prelim genParser logic