Adding order management (first part)