Update/improve application architecture