Improved support and error handling