Made MFW compatible with new event-system