Add action dispatcher
Improved hints handling