Modify the constructor calls #64