Refactor to v47