Description: Add update function
Improve options check

Issue: NA
Author: Arnaud Joubel <arnaud.joubel@gmail.com>
Review: NA
Test performed:jake debug
Test result: pass