Add modification indication and more load logic.