Added further settings