Added System and Subsonic assemblies