Updated velocity templates