Improving import classes