Improve strategy and documentations