Fixed class imports