Add support of options