Added .classic to dispatch imports/packages