Switched to use latest and greatest libraries