Updated to latest packages due to breaking changes in deps