Refactored zones for better structure and clarity.