Refact VelocityChecker & VelocityDao