Replaced deprecated functions