Templates solution added