Added monitor and inspector