Adapted to new watoki/reflect package