@fabpot or anyone else, if there's a better way to do this, let me know right now I don't see a better way to do this, don't break BC and fix this. Thanks!