Added back configuration