Revert "Fields encapsulated"

This reverts commit 82abcd4db7bf037b50a539b1ba1d8b16dbcfcd56.
Revert "Revert "Fields encapsulated""

This reverts commit 92a79d2a321cb5a3f31a1360ee053eb8821eed95.