Add compiler option for higherKinds and clean-up import