Refactor fields for current user / org function