matching the get/set changes in core