Restore old api system