Refactor: import classes instead of using FQN