Refactor design to Foundation