Updated dependencies + ::class fixes