Changed Configs a bit, it should be null safe