Replaced deprecated methods