Adding config checks