Added velocity support