Re-factoring, uses log-service and event-ctrl