Refactored default design.