Add support for Histogram injection
Remove unused imports