Refactor events again and update to 0.3.2