Added tests
Added New Architecture
Added New ExtensionMapping
Added New Tests