Added nullability annotations
Fix for duplicated fields inregenerated lambda