OZP-801: group methods together