Improvements of IDS and reference Open Source implementation

Summary
-
Structured mapping