Update to new architecture