ContentBundle improvements