Add methods
Optimized handler messaging
Optimized handler messaging