separate makeWrapper
handle extensions