Add switch to use monit
Rename attributes