Updated the application architecture