Updated routes / updated generic tool controller