Added templated struct definition