From the information you have given, it looks like you need to add EVENT_TYPE column and specify if it is time_events or repeating_events and use ONLY ONE table.

Hope this helps.

- AD