Yes, I updated for that.
It could reduce the duplicate code and more safe.