Switch away from pimpl pattern