Changed to new option API.