Added ability to set options from env