Add generic type in constructures to make code backward compatible