backward compatibility and deprecation changes