Performance improvements and error management