Updated custom fields and added docs