Refactor/field with id