Finish integrating the struct