Added the possibility to set options