Add picked orders and refactoring