Updated the source files to work with the updated libraries