OK, make sense. I will change API