Re-implemented using S3SQLCustomForms