Add backward compatibility and remarks