Added constructors to object classes