Updated End target to cover ElementType.FIELD