Refactor to use existing keys