Changes for backward compatibility