add missing types from private repo

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>