Modification of Print.cpp and dependent headers