Remove set dependency, add initial templating support