update events and tables
simplify model and design