Code refactor around Krane Types