Add some workaround behavoir for handlers and commands (burn remod)