Added expand option