Removed unnecessary wrapper class.