Updated APIs. Started on some future options.