Add os-Services.
Don't populate hypervisor information unless specifically asked.
Additional debugging.