Refactor - changed field name