Start adding struct fields