Adding back generic arguments to constructors