Added AutoSize feature