DataPoints and LiquidPackage not including targets

Targets are now included inside Values

Signed-off-by: Miguel M. Almeida <miguelcma@cma-retina.lan>