Added constructors for classes