Class Import fix