FIX: remove AddHandler - EspApp does it