Updated deprecated methods (as of 6.0)