improved custom-fields file