Fixed switch statements
Added scr annotations
Added service component instructions for scr
Renamed all log adapters for clarity