Improvements to code type clan support