Added VoidType and CompositeTypes with basic fields