Changed data types for certain Alarm and Metric properties. Made objects a bit more generic.