Refactor design path