Add class for handling metrics
Add new property source ; update tests for new property
Add dispatcher
Working dispatcher