Updated models to avoid null references in order lines