I like it, is way better. I will see if this affects other parts of the codebase and change accordingly.