Added warmup support