I'll create an issue for this. Great idea, but i am going to change it in another PR