Updated data types. And introduced original selection in JList