Extending CI category to include CD, adding a few more tools