Added Heartbeats
Minor improvements to models
Setting up the monitoring engine and the associate tests