Refactored the underlying architecture.