[Refactored Architecture]