Updated types based on auto complete