Refactored Designer