Solving interoperability and integrability issues for the Internet of Things - and especially for the automation domain - is a great challenge. The Arrowhead Framework addresses these issues by providing the innovative concept of Local Clouds, within which some well-defined core systems support the applications, based on the principles of Service Oriented Architectures. Several additions and refinements of the Arrowhead Framework are introduced in this paper - from system and service hierarchies through core system capabilities, as well as interfaces for application systems. The presented enhancements support the advanced functionalities for System-of-Systems, including Quality-of-Service and resource allocation capabilities, inter-cloud servicing, advanced authentication and authorization, and event handling. All mandatory core systems of the Arrowhead Framework are affected somehow in the process: the Service Registry, the Orchestrator and the Authorization System.