Refactored OrderDao