Feature/return missing fields