Minor refactor to Types