Framework architecture updated