Added some more hw manager stuff