Added incomplete support for unnormalized weights