Added misc tools