Architecture improvements