Cleanup / Additional Event Added to Differentiate between Loader and Controller