Added constructors to all non-static classes