Added managment for beans and event dispatching