Added expanded option