>> Whouldn't you mind if we revise it in the future? I don't see now robust solution...

I am not sure what you mean.