Add astcheck and astsearch