Remove the wrapper class, just return and initialize through a separate
function