Improve GA setup