Fixed all deprecated methods