Getting rid of deprecated methods