Added order and product events