facade + small repackaging