Made imported work better