Much more API cleanup around the wrappers