Added custom-fields support