Improved timeout customisation