Restore backward compatibility