Changed constructor impl