Continued term type refactor