Refactored part of how oncall requests are processed