Redesign of code blob types