Added functions to support System Management package