Add struct fields optimization