Use Types constants

Related to #850