Small name change
Removed handler annotation