Fixed compatibility with source 1.5
Started on Concurrency/Event API