Field refactor

Refactor fields