Updated dependencies
Updated code to work with new libraries...