Fixed duplicated product entries, refactored add_products