Feature/more performance

cc @bnoordhuis