Added backward compatibility support