Move DatabaseFieldDescriptor to fields