Added handling for enums, vloats, arrays