Updates for constructor changes