Improved Event and added Alarm interfaces and classes