Use public api when adding legacy options