Feature/102 modify handling subsystem