New events added, Core code refactored.