Moved import statements to mapper