Add backward compatibility