Add online only forward and a corresponding API method to avoid race conditions