Architecture issue resolved