Make Config no longer static