Better velocity import