More re-architecture work