Added custom fields: phase one