reworked Handler preventing possible arguments collisions