Add handlers again but a little bit different.
Bump version to 0.2.