Dispatch as standalone function. Remove unnecessary dict