Updated target to 6.0. Fixed deprecations