Fix for excluding non-editables and add required fields in payload