Event suppor added, still some bugs at startup