Changes done for Order and Product entities