Continued replacing deprecated functions.