Added backward compatibility with v2.5