Change way how options are set to simplify copy-paste of options