added special cases for enum, struct, mod and type declarations plus static variables