Added aggregates to AlarmClock and ClockDisplay and removed the fields