Adding order management (second part)