Updated event interface; Refactored conversion method location to more appropriated places.