Changed the architecture of the solution