Templated changed to library