Updated task related to issues on Modware-Loader