Documentation upgrade
Update option handling to match documentation