[Lot of Changes]

Before creating Terminal List