SYL-60 CHANDED: refactoring of orm listener and indexer