Updated docs and options