Added some more custom fields stuff.