Use new architecture for v0.3