Adding a guard and updating doc strings around custom data.