Added manufacturer list and more