[ModernApp] DrawingSIS refactor