Improve often-used class imports