Updated Service to support options