Task 2 - Improvements in Monitoring and Enforcement