Added hardware check full support