Added in an abstracted configuration