Refactor to use wrapped values