Feature/extended monitoring