Updated options manager to move value logic into get/getOptions based on...

... the existence of a key parameter