Refactored utils, added third party stuff