Improve reload behavior