fix
Extracted all custom handler behaviour out
Seperate arrangement from work