Custom configuration class

Missing a commit in my branch that's kind of important :)