Handlers refactoring #2

Open
optclblast wants to merge 3 commits from handlers into master

3 Commits