Adds custom fields with delegate references

Ah yes, I'll fix that.