Fixed typedef , but looks ugly and cleanup double isa-defs