Modified for Ennds 1.5.1 and made extractor honour the monitorable entity registry