Refactor and new property