Improved 24-hour support