DesignData refactoring