Added in more configuration and tools