Added files for new handlers
Added files for new handlers (fix)
Refactoring