Temporary patch to utilise gridfield for editing