Implemented new architecture.