Idetools improvements