Changed outer constructors to wrappers aount inner constructors.