Major update - template usage.