Restore single class imports