Again, is it the intention to break API or just extend it? Maybe it doesn't matter.