Adjustments to allow all acceptable custom attributes