Updates to include the Google Guava lib