Improving logging and service location lookup
Enforcing service sensor limits