fix extend to not use deprecated methods