Fixed import classes