Added further options