Changed the architecture into a core-wrapper architecture.