Yes, I will do it in the next version.