Imports tweaked to be up to date