Various fixes
Disabled HeartBeat Job as it is not necessary anymore
New Feature : #35