Added monitor types, moved resource monitor