Fix sample page (dependencies needed)
Improve management of raw values