Updating some of the class name/hierachy, adding simple Alert object to send