Change to new archetecture