More types

Signed-off-by: Oleg Bulatov <oleg@bulatov.me>