Updated deprecated methods, bump target to 6.0