Add more hardware checks