Remove Generic and use jre collection, map class