Added map for the Units and fixed the Service Logs Bug