diff --git a/src/R4Mvc.Tools/R4MVC.psd1 b/src/R4Mvc.Tools/R4MVC.psd1
index 744d8ce..e0c4758 100644
--- a/src/R4Mvc.Tools/R4MVC.psd1
+++ b/src/R4Mvc.Tools/R4MVC.psd1
@@ -3,7 +3,7 @@
     ModuleToProcess = 'R4MVC.psm1'
 
     # Version number of this module.
-    ModuleVersion = 1.0.0'
+    ModuleVersion = '1.0.0'
 
     # ID used to uniquely identify this module
     GUID = 'cbe4b5b4-0663-4e78-a43e-33d60e1df7d7'
@@ -83,8 +83,8 @@
 # SIG # Begin signature block
 # MIIe8AYJKoZIhvcNAQcCoIIe4TCCHt0CAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
 # gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR
-# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUlszxsB+ecb9VX7FB9ojWLwRs
-# vWCgghkcMIIF2DCCA8CgAwIBAgIQbDvSft08lJ6Vjiips8dXoDANBgkqhkiG9w0B
+# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUI1CVTpImCYPuQChYIQ72gxRj
+# YyOgghkcMIIF2DCCA8CgAwIBAgIQbDvSft08lJ6Vjiips8dXoDANBgkqhkiG9w0B
 # AQsFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkG
 # A1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UE
 # AxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTUxMjE2MDEw
@@ -223,28 +223,28 @@
 # dHkxIzAhBgNVBAMTGlN0YXJ0Q29tIENsYXNzIDIgT2JqZWN0IENBAhBAPVEUYJRI
 # bRTqOS7gDAEkMAkGBSsOAwIaBQCgeDAYBgorBgEEAYI3AgEMMQowCKACgAChAoAA
 # MBkGCSqGSIb3DQEJAzEMBgorBgEEAYI3AgEEMBwGCisGAQQBgjcCAQsxDjAMBgor
-# BgEEAYI3AgEVMCMGCSqGSIb3DQEJBDEWBBQ3p6+f5p5+VnKEPYpGJnJb7IYuhzAN
-# BgkqhkiG9w0BAQEFAASCAgAhKMPz/gnEqwg2wmyP0R6KLASl31zFRVf3JY7heWRi
-# tSLLuPnZxIzLj6+zrz9F5wqFEM3iDfxMagCn/MXTNqjj+M2aLBlIfYnGZLmkGcyX
-# IC2WggOLhgkHD/Ynp/ciXDe6hveOXpjAAZGnPuuhhzSXbxUDbOPOryZI+ozaK2GC
-# AuhoUMpqteOInE6TeSQ5yB9BdRBvP1oCEBKXHg4CzT/9hdzaM6sIYB/ReJw4L+aT
-# 4NnqcbomRyjF/RcUHZAsfo1e0RabUCIj5kzTpqeZMY+AvwEK9DXvBTZTKz8+rNaZ
-# BgAH8K4ZyEc7QcXZN6xf1iboGNhnIY/HOlQIfwZpmOmpYctuemtGwUUy2nRQcOL9
-# fj2vv9dhH7W+vTbdNvlbY0lLKMzOP7AAKUJPOEt/RUzjFv//cu4K9t5zHYWfXzgY
-# M9Rv6yw4NcHKNN+/vO1VGQu2IsQu46d5H7rSRHV2SzsdljjGPjrt9PhaBn7rASH0
-# D7hlH4s1C1VnSje7R5KjwLY3I4qvG5v7T0cLFoKFDdXKE+ebJfWweijAcu8BNynW
-# 4Yi/4TKnheSEttbcpExhnMyLbhStNISfImJ1qTVbsF1BoS92KsU4Kup9wZvxQn1X
-# SpFEToM5GYvJrfhTfRIwLWwtkoa1H6FePf33TVpfd1b39g2irvkktBNoyNlT8XMJ
-# bqGCAg8wggILBgkqhkiG9w0BCQYxggH8MIIB+AIBATB2MGIxCzAJBgNVBAYTAlVT
+# BgEEAYI3AgEVMCMGCSqGSIb3DQEJBDEWBBR5u0Xmv0myEp2L2Bj2oyZXr3vboTAN
+# BgkqhkiG9w0BAQEFAASCAgB5tj4WScpb8mwaJQWyE506vPukmMoo8wQUj6l79hrA
+# plmx5Un5e5AgdhzoFbRu8HkDC6fRGkZ7+NBZxlCTBiZfkfG5Xr+uUpY3d2vNFxqt
+# eMaJnLMXb9av4Cbi+ppZxczesZymni4B3YOVRXjFUvjdv5J5HytwsjlG+jhMYhWJ
+# P+Y9pDMu+kAN4Hv76A/l7WIqr0+V4GdrqhrXQv/j//pdrradUiIbGndyYurMtFP5
+# rXFo5fo0RMTUCVhtdCAEitx93FR43F/suvNE28aARlM1O9XlfO582l6btR7snmVV
+# ZRsFC0f7Twyah1N05R01KpN/8CPfmcnAv55ySpEKipUXZK3u6w+SAfZumjqTeZD3
+# XzEWPb2Z0OIyQsTnZgUZyPqLgJ8JmlNykCeyzwlsk0HxbWQBaIiiAFrTqB6UzDj0
+# v20yGvZZ6ipFvyWi1RRc5Kw1aTJS84gcAmG1JUkC0bhO2mxnZiqrxB9CXqbiRMFv
+# 2pURVpY1DbaaVoits+kbqOXebDMScioRUh5tg6Q8gCp8uar4Aq5n0OXCpt4hRxUl
+# +nus6ODlUW2xZ8EPtacxekynJzY3deWplB0Zn+D25EK39a7qMClKsg5/ZL3IYM59
+# 5eXkFL7DMFWkSbnKG4qJ6fnJrl7Y4UkvOhGujFRowg9MB6JF8c5CTKGNCuquKjOE
+# VaGCAg8wggILBgkqhkiG9w0BCQYxggH8MIIB+AIBATB2MGIxCzAJBgNVBAYTAlVT
 # MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
 # b20xITAfBgNVBAMTGERpZ2lDZXJ0IEFzc3VyZWQgSUQgQ0EtMQIQAwGaAjr/WLFr
 # 1tXq5hfwZjAJBgUrDgMCGgUAoF0wGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAc
-# BgkqhkiG9w0BCQUxDxcNMTcwODEwMjIwMDQzWjAjBgkqhkiG9w0BCQQxFgQUj3ME
-# CT9wQdcKkFiEzG7IF5obot4wDQYJKoZIhvcNAQEBBQAEggEAHoehJJfBH5TMINtL
-# XaPLy6UV52AxDCyucTGvlNU9XuEx6ug52vEtR3z3FADIETLFjo2fI4Oe/XU+h+Qq
-# hehFCGV7ng6izuy9gNxC+buSk4Hx73Rd19y8712Bia4aTPSJ3aljimVzKZhqyDm9
-# Nx5YVx7Cz2St82ku2iOm+vETmUGmx18KJ06Zbwa1AVPfPYgHToPSN1SFYTFif9Kq
-# jGCjS4Rs/1u8tPbMV8DG27ET/bdvIGtyuMEc6pzUvlQTyEAWAAvaxTWZAfL4oUXT
-# mGdOLirC9bbnCeNNK0awJWtQYrYs4Ridi7DqfikFrwLCw33f1WlLpBPeOlZjbtIA
-# Lpe+NQ==
+# BgkqhkiG9w0BCQUxDxcNMTcwODIxMjE0OTM0WjAjBgkqhkiG9w0BCQQxFgQUcez1
+# iwao3QCTeGgHPXJ6NqlsA/0wDQYJKoZIhvcNAQEBBQAEggEAVhQIcnQsUC8NJSkb
+# Q+EnbHborhpeeEd7JF7Tcthjbj30g40iq5TswaSKaPyvINIOn+2cj2ls/kvz54Ok
+# pmq+/P6SoGjAHAK4GyJa5nd9wXcdz3ZpdZpcnYbJ/qTwpZ+TosUW/cjzOZ9bEsuM
+# jpPSW6n8QoSqvkeXEl50EB0nNFsekc7zah0vXAO0i9c1Za53enupMFhVryENNdzr
+# HRvnAE4DRmOFdchOs/INMTlrtYhi0x8sIOCIPaKS4y9vEODU0Yz9GpWi2iEBu9o8
+# BRTUZvs4vKjQW2W+zEd5+L4rWbhgXHjir0lcObVi5DzMyLOdNM4VoP5UIhlblWu8
+# tMsCDg==
 # SIG # End signature block
diff --git a/src/R4Mvc.Tools/init.ps1 b/src/R4Mvc.Tools/init.ps1
index df482b4..9cdedbb 100644
--- a/src/R4Mvc.Tools/init.ps1
+++ b/src/R4Mvc.Tools/init.ps1
@@ -7,13 +7,11 @@ if (Get-Module 'R4MVC')
 
 Import-Module (Join-Path $PSScriptRoot 'R4MVC.psd1') -DisableNameChecking
 
-Generate-R4MVC
-
 # SIG # Begin signature block
 # MIIe8AYJKoZIhvcNAQcCoIIe4TCCHt0CAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
 # gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR
-# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUOLNyKMK7/P8FKLWUf1kpv1GA
-# jpigghkcMIIF2DCCA8CgAwIBAgIQbDvSft08lJ6Vjiips8dXoDANBgkqhkiG9w0B
+# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQULec7uUDbifxG9vNft4udyVwW
+# yougghkcMIIF2DCCA8CgAwIBAgIQbDvSft08lJ6Vjiips8dXoDANBgkqhkiG9w0B
 # AQsFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkG
 # A1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UE
 # AxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTUxMjE2MDEw
@@ -152,28 +150,28 @@ Generate-R4MVC
 # dHkxIzAhBgNVBAMTGlN0YXJ0Q29tIENsYXNzIDIgT2JqZWN0IENBAhBAPVEUYJRI
 # bRTqOS7gDAEkMAkGBSsOAwIaBQCgeDAYBgorBgEEAYI3AgEMMQowCKACgAChAoAA
 # MBkGCSqGSIb3DQEJAzEMBgorBgEEAYI3AgEEMBwGCisGAQQBgjcCAQsxDjAMBgor
-# BgEEAYI3AgEVMCMGCSqGSIb3DQEJBDEWBBSdGbTVwKZtmUBuNq5fD1VWxVRVUzAN
-# BgkqhkiG9w0BAQEFAASCAgCLXD3T8ql7PTWoz0DdxNBIG4PhzNClFfdU7HhX0fBu
-# boREqFY+egYM6IvquGdsxyWYNihWdvPtB5HEAq3CQCUdV5kPyIvcW9TD8ACcGYlo
-# LkXHJv5QuIJ8PHY9dYdFRXzGSJXsM9ijYEhlGiekMlxYYfqKVd3uAbDHPJ6n3XuV
-# RDO7x+wsnodzaLfhFLee7/4vw5gxzsg9Waf8h5l8xeN37JI7YfX4PNwSBdgZ7gfT
-# AC81E9xtdFvx/BE1IpOsMWgQdepef+619m/s9uYG/qIRYyeq0pLZiyw63L9RHDHi
-# ftum/KUwaYpzfcp+K9RTov0aenXZqbdOOrFSTSTjK/J6dWml1BHCoKc3/+Pm3hQo
-# f+fc/3tY8a+m+pO7JTQV49hk/qi1uXW4iZ1mSf8GyEJkV7dTrIq93EoQaKQvQ7oJ
-# 1TjMKdo4SbsSN+hIzo7OF3l2eB09vMrRrusukxUqkUZM0yQx2YIXSVxcGmzZGOi9
-# kgJ8z7k9T/6NYaCa22CMx3pmCbsg3H8TMHWftqEe99DemarDsibXtNGyqqQz8vsI
-# LxKTAb46/I9KSKr9l0fB+Oac/rdGR+39OB1n1oFpHnsbHKucVCdYeQ263c3EjtHp
-# jEOl2iodIgB+JkH0GWgyup2AbVIXdV8Zcp3fowzmv5+I5yCuo5I2+jcTzbCAwlzW
-# OqGCAg8wggILBgkqhkiG9w0BCQYxggH8MIIB+AIBATB2MGIxCzAJBgNVBAYTAlVT
+# BgEEAYI3AgEVMCMGCSqGSIb3DQEJBDEWBBQ/9PUEMt28nxozeV9kjvS8bd2RojAN
+# BgkqhkiG9w0BAQEFAASCAgB8E5sXK5ImgI1f5DsRR+abYkHEVuzveDnYzT9AvqtW
+# 0xQzoAxZsDfoI3l9DZ93c2Iq1Wd7TcqI+nHvdRgdCFKpuLMiGnlG7u0zLc67mdq6
+# caU+YCVQK1chIh3yP3+N5aihfG6tgBekUiW6UvJGWZEVtfDcL7cZTPG80w0MEKFw
+# e1KByz7DZiKUP5fbPSAOW4KDApIw9GhX5i1cgYL89Xt/QLqiyS7R824j+xAGrzXv
+# nLIqMv5llQ4KWfElK6nehtNulndda5dJNJbOOhevLJf0UhwvED1MNpsAGLzvKokX
+# s/dF/otIoaoTUbwYl89xk4sbIEabFXqoRx3FW695MbZmG3URdtSeBjQzcu6uPRfp
+# uuog7Ie+0B7hCP74AanNDBosMgFaPwNHh98RpdpIF00vw3pi0MW1x5Zw4c+dmZIW
+# lKG27+t+NLRBH1ZFARa4QQ/hXb2S5917Ksnb6njrFiJWbwEgrMS/UBAwgouQab8N
+# 5se18yWXYRx3BMCnYbrqe8O76p0UbWyp31OwVwEMAB2XybTrx3AuEEuYr9yCGDkr
+# +tooeCWmS01rgbcpIKggFiIuU9B1K0SmU/2cXqQdt/P7b2qLvJWjj0ip8xxAWeJ2
+# GJBVALZLi83wS4aoenARiWc39Po+EE2BLBvvJC+SIipEBhrpa4bFOvMHU26gaQ23
+# 2KGCAg8wggILBgkqhkiG9w0BCQYxggH8MIIB+AIBATB2MGIxCzAJBgNVBAYTAlVT
 # MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
 # b20xITAfBgNVBAMTGERpZ2lDZXJ0IEFzc3VyZWQgSUQgQ0EtMQIQAwGaAjr/WLFr
 # 1tXq5hfwZjAJBgUrDgMCGgUAoF0wGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAc
-# BgkqhkiG9w0BCQUxDxcNMTcwODEwMjIwMTA4WjAjBgkqhkiG9w0BCQQxFgQUXSdr
-# RfxrjW2rwYWDJg7SHU5KxwwwDQYJKoZIhvcNAQEBBQAEggEAR5A7W31s2mg490X0
-# BhwEMK1uS262KgmUbTlsKTDo+3opgKiER0fpoPjWe8DIw7WONHydrHQhKf5N+mAR
-# 7JwECuhNqvofl2cJXDPDWsY7zZqAq2Rml1T/DhIkLbLezgPyo9uzUv2XmWRqmCUK
-# tYmJsho52/2wmCgC+gOVPxOskxsfdleIoLOv6whQyOb2Oi4TuzL7R2qXnUVkhFcu
-# aPzIb/CuGva5NxKUDrtRehiDC5gqVLrA8dq/YcMqLAVXmm9azoNeuLwVOOmhfjTX
-# yOFfm1GYx8kff4yP/JNFlQf5HYoaPEX73nh6G2wChJdtmQ0/pCzzb6Sl2xxeJbUG
-# RSloMw==
+# BgkqhkiG9w0BCQUxDxcNMTcwODIxMjE0OTQ4WjAjBgkqhkiG9w0BCQQxFgQUA7e8
+# NKMaPUEk6JwyYyAeEA1Aj4QwDQYJKoZIhvcNAQEBBQAEggEAT6YUWbW2S6NsKrco
+# q9Y1dR/Xp8CsS1wjMsqvDqtZY9wcmOG8LU4xKU8nowZoB8WbwB7TnxKDNQScrZYz
+# ZkYrrjCsVV31Yf5hIEBQ141QpIvtDxl8bD/NHuGMKhm9NvrSA0yY/algETy3Io5g
+# nJc9fQGuUau7nGANaG1MGahXYGDnF3bF35trEOHY2y1sXhqwdaJpOBnjSYgtOKz6
+# SYYlZMU3Y2129htOeidUgO5+TYfpZaJSvLiDdPv7ZLJmwSZu6sig8mDKFzCb5UgT
+# JqUIKUjy89bUnVOwsmKEMW/6I7eH95b9BkEPq4bZfQEzMzDUD1vZeqJPRO8bS5is
+# FGhGgA==
 # SIG # End signature block