Added constructors to classes