Replaced the last set of deprecated functions