Add env variable
Refactor product_name