fixed composer dependency and events handling