Update dependencies to fix issue and improve performance