Changed constructor