Call refactor to separate lib calls from the rest of the cases