Change to initilizer list construction