Added payment info
Remove User's hasMany relation, as well as ease out Shipment query as we don't need the orders at that point.