Updated Logger, added Event Bus