Updating project to work with more recent libraryes