Added Events and sample framework