Moved options to Session parameters.