Added support for velocity