Improve struct definition