Added state alert type. Refactored alert hierarchy.