fix(all): without templates as well