No more direct field use