Updates to core hawk/lb import scripts for use in generator