Added ClassFile type, and interface handling.