Changed constructor arguments