Feature/interrupt armor