Introduce handlers
Simplify
Merge pull request #136 from mirumee/handlers

Introduce handlers