Changed constructors to new <T> syntax