Added generics statements on constructor