Refactor/field with id

Please move second argument to a newline thing is too long