Added 3rd party libraries and more