Updated types