Improved design for better maintainability.