Initial rewrite of core system descriptions