Minor cleanup, enable deep object with addCourier