More changes... introduced product domain against product id