New archetecture for clients