Designer Support refactored