Fix with the internal API implemented