Updating use statements to include core classes