Makes sense Joas. Maybe will be modified with some another PR if applicable?