Update import calls

Updated import calls to work properly.