Added option to not strip types