OK today I'll try to refactor the code in the way you suggested, I was trying to be compatible with the old interface, but apparently you want to deprecate the old interface which is fine I think.