Improve strategy system.