Upgraded libs and refactored util Classes