Add Configuration, and better debugging