Architecture modification