Updated/New Composer support for Event_Dispatcher

See diff for full changes