Various syntax, semantic and other changes to Architectural thingie