Changes for override methods