[IMP] only upload products and not services
[IMP] rename some methods