Fix/Only required libaries are now included