Moved alerts into its own class, following the latest format