backward compatibility changes