Moved non-events/setup functions to invoker_functions