Missing some sufia bits in the refactor