Update handlers to use FML events