Added a any template and some more changes.