Added type parameter for struct (#94)