Fixed templating issue. Modularized template vs functional implementations