Changed module prepare method to called via event system