[+] Enumerants are now all ints
[+] More states
[+] More vector types