Implemented new approach for velocity service