Add types subpackage