[TASK] Move reoccuring options into event object