Add parameters to constructors to make merging with mta branch easier