Feature/finer template control