Complete refactor to new stub