Add more types

Getting my ass handed over to me by `state-get`