UPDATE
split in monitoring
remove master entity