Moving Internal to Types