Rewrite Beta-API