Updated types and domains