Added further configuration