Add option for lazy activation