Refactoring names, changed handler loading init