Added backward compatibility for old version