Updated to use canOverride for bucket placement