Reduced timeouts and resources needs