Pulled latest Rewritten-APIs