Add better configuration