Improved hardware types