Tag a few more classes with the VelocityContextProvider interface
Basic extraction done, but need to think on how to propagate the extracted values